From: Benjamin Berg <bberg@redhat.com>
Date: Mon, 23 Sep 2019 09:04:18 +0000 (+0200)
Subject: main: Remove NOTIFY_SOCKET from environment
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~811^2^2~24
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0fdbde9101ee5bfe87344cbb2ee43dad32a7f7a6;p=gnome-shell.git

main: Remove NOTIFY_SOCKET from environment

It is only used exactly once to notify systemd about the service
startup. So unset it as soon as possible as it can leak into
subprocesses we spawn otherwise.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/741
---

diff --git a/src/main.c b/src/main.c
index 8be1395f7..489026b76 100644
--- a/src/main.c
+++ b/src/main.c
@@ -532,7 +532,9 @@ main (int argc, char **argv)
   shell_init_debug (g_getenv ("SHELL_DEBUG"));
 
   shell_dbus_init (meta_get_replace_current_wm ());
-  sd_notify (0, "READY=1");
+  /* We only use NOTIFY_SOCKET exactly once; unset it so it doesn't remain in
+   * our environment. */
+  sd_notify (1, "READY=1");
   shell_a11y_init ();
   shell_perf_log_init ();
   shell_introspection_init ();